bitkeeper revision 1.1389.5.47 (428097d990dkErUuSLQc-i2mdjfq-w)
authormafetter@fleming.research <mafetter@fleming.research>
Tue, 10 May 2005 11:15:37 +0000 (11:15 +0000)
committermafetter@fleming.research <mafetter@fleming.research>
Tue, 10 May 2005 11:15:37 +0000 (11:15 +0000)
Merge maf46@ssh-relay1.cl.cam.ac.uk:/usr/groups/xeno/BK/xen-unstable.bk
into fleming.research:/scratch/fleming/mafetter/xen.work

1  2 
xen/arch/x86/shadow.c

Simple merge